gdkwindow-wayland: Erm, put the DESTROYED check in the right spot...
authorJasper St. Pierre <jstpierre@mecheye.net>
Fri, 31 Jan 2014 21:39:33 +0000 (16:39 -0500)
committerJasper St. Pierre <jstpierre@mecheye.net>
Fri, 31 Jan 2014 21:43:49 +0000 (16:43 -0500)
gdk/wayland/gdkwindow-wayland.c

index ec51f590a78762cb3dccbd4f44c1c08659ab2844..025b03ba222433c06710c8ea2afa8a6d0c669a8b 100644 (file)
@@ -315,6 +315,10 @@ frame_callback (void               *data,
   GdkFrameTimings *timings;
 
   wl_callback_destroy (callback);
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
   _gdk_frame_clock_thaw (clock);
 
   timings = gdk_frame_clock_get_timings (clock, impl->pending_frame_counter);
@@ -403,10 +407,6 @@ on_frame_clock_after_paint (GdkFrameClock *clock,
     return;
 
   impl->pending_commit = FALSE;
-
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
-
   impl->pending_frame_counter = gdk_frame_clock_get_frame_counter (clock);
 
   callback = wl_surface_frame (impl->surface);